Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 7 Jun 2010 22:49:32 +0000 (22:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 7 Jun 2010 22:49:32 +0000 (22:49 +0000)
commit61acbefa139802e97d722f82e84d157eae733814
treea09dd9380cea05ad54b0cd3624ac81174ff6cff1
parentf1a971fceee1d9fa827ff08d1f57cf2046f311ef
parent9196e03ef638a21d5c8ff0ab31ae40dd83842eae
Merge from mainline.